entry: Make placeholder-text work again

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 854410dddf3c50f0cc304bc5c01bd284d2456e33..bcf849588332e084d27140749249c576c9f3f2f7 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -3363,11 +3363,11 @@ void
 gtk_entry_set_placeholder_text (GtkEntry    *entry,
                                 const gchar *text)
 {
-  g_return_if_fail (GTK_IS_ENTRY (entry));
+  GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry);
 
-  //FIXME
+  g_return_if_fail (GTK_IS_ENTRY (entry));
 
-  g_object_notify_by_pspec (G_OBJECT (entry), entry_props[PROP_PLACEHOLDER_TEXT]);
+  gtk_text_set_placeholder_text (GTK_TEXT (priv->text), text);
 }
 
 /**
@@ -3384,10 +3384,11 @@ gtk_entry_set_placeholder_text (GtkEntry    *entry,
 const gchar *
 gtk_entry_get_placeholder_text (GtkEntry *entry)
 {
+  GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry);
+
   g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL);
 
-  //FIXME
-  return NULL;
+  return gtk_text_get_placeholder_text (GTK_TEXT (priv->text));
 }
 
 /**